Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 23 May 2011 00:09:23 +0000 (17:09 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 23 May 2011 00:09:23 +0000 (17:09 -0700)
commitcfc9f5858f0ebd0fff74bbb968b2f8979c522384
tree7defc2df6b6a1eb98e548d4c7fa8d7e299075242
parent81ee149f02c45a594c9691ed75910c063d546952
parentef3dc7fdc321144850c05dc4ad9ebbe89cfb9359
Merge from trunk.
src/ChangeLog